Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPFL svg official icons #672

Merged
merged 3 commits into from
Jul 20, 2023
Merged

EPFL svg official icons #672

merged 3 commits into from
Jul 20, 2023

Conversation

xentenza
Copy link
Collaborator

Updated and new icons branch, reloaded.

  • added EPFL official icons to the Styleguide.

added EPFL official icons to the Styleguide
package.json Outdated
@@ -169,6 +169,7 @@
"jquery-mousewheel": "^3.1.13",
"multiple-select": "^1.5.2",
"object-fit-images": "^3.2.4",
"package.json": "^2.0.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'est bizarre ce changement.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plus rien ne fonctionnait en local, j'ai donc du faire un npm install package.json
Pourquoi ça a ajouté cette ligne, aucune idée. Toujours est-il que c'est supprimé

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oui, il y a toujours le problème. Les tests ne passent pas.

Il y a un conflit entre yarn.lock et package-lock.json.
Tu peux supprimer le fichier package-lock.json et annuler tous les changements du yarn.lock.

Correction commentaire #672 (review)
-deleted package-lock.json
- revert changes yarn.lock
@github-actions
Copy link

Unit Test Results

    1 files      1 suites   0s ⏱️
261 tests 255 ✔️ 0 💤 0  6 🔥
261 runs  249 ✔️ 0 💤 6  6 🔥

For more details on these errors, see this check.

Results for commit 4e775ed.

@github-actions
Copy link

🔎 Download the Backstop report for this pull request (link valid for 90 days):

@williambelle williambelle merged commit d2d10ff into dev Jul 20, 2023
4 checks passed
@williambelle williambelle deleted the styleguide/epfl-icons branch July 20, 2023 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants